Merge version 1.0.1-1+rpi1 and 1.0.2-1 to produce 1.0.2-1+rpi1

Merge flatpak (1.0.1-1+rpi1) import into refs/heads/workingbranch

Use Python 3 for tests

Forwarded: not-needed

Gbp-Pq: Topic debian
Gbp-Pq: Name Use-Python-3-for-test-web-server.patch

test-webserver: Fix race condition

If we rely on the background subshell to create the httpd-output file,
and we are unlucky, then the "cp" invocation in the loop might execute
before the file has been created, and fail. This appears to have
happened on Debian's arm64 autobuilder, which failed with:

    Running web server: PYTHONUNBUFFERED=1 setsid python3 /<<PKGBUILDDIR>>/tests/http-utils-test-server.py 0
    Web server pid: 13319
    Waiting for web server (1/300)...
    cp: cannot stat '/var/tmp/tap-test.p1cxRN/httpd-output': No such file or directory

Signed-off-by: Simon McVittie <smcv@debian.org>
Gbp-Pq: Name test-webserver-Fix-race-condition.patch

flatpak (1.0.1-1+rpi1) buster-staging; urgency=medium

  * Disable testsuite, it seems to fail on our wandboards (but not on our lxc
    based autobuilders).

[dgit import unpatched flatpak 1.0.1-1+rpi1]

Import flatpak_1.0.1-1+rpi1.debian.tar.xz

[dgit import tarball flatpak 1.0.1-1+rpi1 flatpak_1.0.1-1+rpi1.debian.tar.xz]

Merge flatpak (1.0.2-1) import into refs/heads/workingbranch

Use Python 3 for tests

Forwarded: not-needed

Gbp-Pq: Topic debian
Gbp-Pq: Name Use-Python-3-for-test-web-server.patch

test-webserver: Fix race condition

If we rely on the background subshell to create the httpd-output file,
and we are unlucky, then the "cp" invocation in the loop might execute
before the file has been created, and fail. This appears to have
happened on Debian's arm64 autobuilder, which failed with:

    Running web server: PYTHONUNBUFFERED=1 setsid python3 /<<PKGBUILDDIR>>/tests/http-utils-test-server.py 0
    Web server pid: 13319
    Waiting for web server (1/300)...
    cp: cannot stat '/var/tmp/tap-test.p1cxRN/httpd-output': No such file or directory

Signed-off-by: Simon McVittie <smcv@debian.org>
Forwarded: https://github.com/flatpak/flatpak/pull/2098

Gbp-Pq: Name test-webserver-Fix-race-condition.patch

flatpak (1.0.2-1) unstable; urgency=medium

  * New upstream release
  * d/p/debian/patches/test-webserver-Fix-race-condition.patch:
    Mark as forwarded
  * d/libflatpak0.symbols: Update

[dgit import unpatched flatpak 1.0.2-1]

Import flatpak_1.0.2.orig.tar.xz

[dgit import orig flatpak_1.0.2.orig.tar.xz]

Import flatpak_1.0.2-1.debian.tar.xz

[dgit import tarball flatpak 1.0.2-1 flatpak_1.0.2-1.debian.tar.xz]

Merge flatpak (1.0.1-1) import into refs/heads/workingbranch

Import flatpak_1.0.1.orig.tar.xz

[dgit import orig flatpak_1.0.1.orig.tar.xz]

Use Python 3 for tests

Forwarded: not-needed

Gbp-Pq: Topic debian
Gbp-Pq: Name Use-Python-3-for-test-web-server.patch

test-webserver: Fix race condition

If we rely on the background subshell to create the httpd-output file,
and we are unlucky, then the "cp" invocation in the loop might execute
before the file has been created, and fail. This appears to have
happened on Debian's arm64 autobuilder, which failed with:

    Running web server: PYTHONUNBUFFERED=1 setsid python3 /<<PKGBUILDDIR>>/tests/http-utils-test-server.py 0
    Web server pid: 13319
    Waiting for web server (1/300)...
    cp: cannot stat '/var/tmp/tap-test.p1cxRN/httpd-output': No such file or directory

Signed-off-by: Simon McVittie <smcv@debian.org>
Gbp-Pq: Name test-webserver-Fix-race-condition.patch

flatpak (1.0.1-1) unstable; urgency=medium

  * New upstream release
    - Drop most patches, applied upstream
  * d/p/test-webserver-Fix-race-condition.patch:
    Fix a race condition in test setup

[dgit import unpatched flatpak 1.0.1-1]

Import flatpak_1.0.1-1.debian.tar.xz

[dgit import tarball flatpak 1.0.1-1 flatpak_1.0.1-1.debian.tar.xz]

Merge flatpak (1.0.0-1) import into refs/heads/workingbranch

Use Python 3 for tests

Forwarded: not-needed

Gbp-Pq: Topic debian
Gbp-Pq: Name Use-Python-3-for-test-web-server.patch

test-webserver: Be more verbose about what we're doing

Signed-off-by: Simon McVittie <smcv@debian.org>
Gbp-Pq: Name test-webserver-Be-more-verbose-about-what-we-re-doing.patch

Make test scripts bilingual Python 2/Python 3

Signed-off-by: Simon McVittie <smcv@debian.org>
Forwarded: https://github.com/flatpak/flatpak/pull/1990

Gbp-Pq: Name Make-test-scripts-bilingual-Python-2-Python-3.patch

tests: Remove vestigial support for putting Python 2 in a runtime

This is only used in the flatpak-builder tests now, not the main
flatpak tests.

Signed-off-by: Simon McVittie <smcv@debian.org>
Forwarded: https://github.com/flatpak/flatpak/pull/1990

Gbp-Pq: Name tests-Remove-vestigial-support-for-putting-Python-2-in-a-.patch

tests: Look for httpcache in ${test_builddir}, not PATH

For installed-tests, the installed test directory is not on the PATH.
To make this easier, put the uninstalled binary in tests/, so that
in both build-time and installed tests, it is in ${test_builddir}.

Signed-off-by: Simon McVittie <smcv@debian.org>
Forwarded: https://github.com/flatpak/flatpak/pull/1989

Gbp-Pq: Name tests-Look-for-httpcache-in-test_builddir-not-PATH.patch

build: Install httpcache if installed-tests are enabled

Signed-off-by: Simon McVittie <smcv@debian.org>
Forwarded: https://github.com/flatpak/flatpak/pull/1989

Gbp-Pq: Name build-Install-httpcache-if-installed-tests-are-enabled.patch

flatpak (1.0.0-1) unstable; urgency=medium

  * New upstream stable release
  * (Build-)Depend on ostree 2018.7
  * flatpak Recommends p11-kit, for p11-kit-server
  * d/p/build-Install-httpcache-if-installed-tests-are-enabled.patch,
    d/p/tests-Look-for-httpcache-in-test_builddir-not-PATH.patch:
    Add patches to fix installed-tests
  * d/p/Make-test-scripts-bilingual-Python-2-Python-3.patch,
    d/p/test-webserver-Be-more-verbose-about-what-we-re-doing.patch:
    Add patch to make test scripts equally valid in Python 3
  * d/p/tests-Remove-vestigial-support-for-putting-Python-2-in-a-.patch:
    Remove support for including Python 2 in a runtime, which is only
    used in flatpak-builder
  * d/p/debian/Use-Python-3-for-test-web-server.patch:
    Expand to cover more test code
  * Standards-Version: 4.2.0

[dgit import unpatched flatpak 1.0.0-1]

Import flatpak_1.0.0.orig.tar.xz

[dgit import orig flatpak_1.0.0.orig.tar.xz]

Import flatpak_1.0.0-1.debian.tar.xz

[dgit import tarball flatpak 1.0.0-1 flatpak_1.0.0-1.debian.tar.xz]

Merge flatpak (0.99.3-1) import into refs/heads/workingbranch

Use Python 3 for test web server

The parts of libtest.sh and tests/make-test-runtime.sh that deal with
Python 2 are unaffected: they are only used in the flatpak-builder
tests.

Forwarded: not-needed

Gbp-Pq: Topic debian
Gbp-Pq: Name Use-Python-3-for-test-web-server.patch

flatpak (0.99.3-1) unstable; urgency=medium

  * New upstream release
    - Drop patch from previous version, applied upstream
    - Update symbols file

[dgit import unpatched flatpak 0.99.3-1]

Import flatpak_0.99.3.orig.tar.xz

[dgit import orig flatpak_0.99.3.orig.tar.xz]

Import flatpak_0.99.3-1.debian.tar.xz

[dgit import tarball flatpak 0.99.3-1 flatpak_0.99.3-1.debian.tar.xz]

Merge flatpak (0.99.2-3) import into refs/heads/workingbranch

Use Python 3 for test web server

The parts of libtest.sh and tests/make-test-runtime.sh that deal with
Python 2 are unaffected: they are only used in the flatpak-builder
tests.

Forwarded: not-needed

Gbp-Pq: Topic debian
Gbp-Pq: Name Use-Python-3-for-test-web-server.patch

Fix error handling while deploying AppStream

Setting an error with second_error->message is going to work poorly
when second_error has never been set non-NULL.

Related to #1845, although not necessarily the full solution.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Forwarded: https://github.com/flatpak/flatpak/pull/1867

Gbp-Pq: Name Fix-error-handling-while-deploying-AppStream.patch

flatpak (0.99.2-3) unstable; urgency=medium

  * Standards-Version: 4.1.5 (no changes required)
  * Put helper binaries in /usr/libexec as allowed by FHS 3.0
  * d/p/Fix-error-handling-while-deploying-AppStream.patch:
    Add a patch fixing error handling in system helper

[dgit import unpatched flatpak 0.99.2-3]

Import flatpak_0.99.2-3.debian.tar.xz

[dgit import tarball flatpak 0.99.2-3 flatpak_0.99.2-3.debian.tar.xz]

Merge flatpak (0.99.2-2) import into refs/heads/workingbranch

Use Python 3 for test web server

The parts of libtest.sh and tests/make-test-runtime.sh that deal with
Python 2 are unaffected: they are only used in the flatpak-builder
tests.

Forwarded: not-needed

Gbp-Pq: Topic debian
Gbp-Pq: Name Use-Python-3-for-test-web-server.patch

flatpak (0.99.2-2) unstable; urgency=medium

  * Version the ostree command-line tool dependency for the tests.
    For the stretch backport, the ostree in stretch is not enough: we need
    the one from stretch-backports.

[dgit import unpatched flatpak 0.99.2-2]

Import flatpak_0.99.2-2.debian.tar.xz

[dgit import tarball flatpak 0.99.2-2 flatpak_0.99.2-2.debian.tar.xz]

Import flatpak_0.99.2.orig.tar.xz

[dgit import orig flatpak_0.99.2.orig.tar.xz]

Merge flatpak (0.99.2-1) import into refs/heads/workingbranch

Use Python 3 for test web server

The parts of libtest.sh and tests/make-test-runtime.sh that deal with
Python 2 are unaffected: they are only used in the flatpak-builder
tests.

Forwarded: not-needed

Gbp-Pq: Topic debian
Gbp-Pq: Name Use-Python-3-for-test-web-server.patch

flatpak (0.99.2-1) unstable; urgency=medium

  * New upstream release

[dgit import unpatched flatpak 0.99.2-1]

Import flatpak_0.99.2-1.debian.tar.xz

[dgit import tarball flatpak 0.99.2-1 flatpak_0.99.2-1.debian.tar.xz]

Merge flatpak (0.99.1-1) import into refs/heads/workingbranch

Use Python 3 for test web server

The parts of libtest.sh and tests/make-test-runtime.sh that deal with
Python 2 are unaffected: they are only used in the flatpak-builder
tests.

Forwarded: not-needed

Gbp-Pq: Topic debian
Gbp-Pq: Name Use-Python-3-for-test-web-server.patch

flatpak (0.99.1-1) unstable; urgency=medium

  * New upstream release
    - Update symbols file for new ABI
    - Bump ostree dependencies to 2018.6
    - flatpak Suggests avahi-daemon for peer-to-peer app sharing
    - Install new flatpak-coredumpctl script as an example

[dgit import unpatched flatpak 0.99.1-1]

Import flatpak_0.99.1.orig.tar.xz

[dgit import orig flatpak_0.99.1.orig.tar.xz]

Import flatpak_0.99.1-1.debian.tar.xz

[dgit import tarball flatpak 0.99.1-1 flatpak_0.99.1-1.debian.tar.xz]

Merge flatpak (0.11.8.3-1) import into refs/heads/workingbranch

Use Python 3 for test web server

The parts of libtest.sh and tests/make-test-runtime.sh that deal with
Python 2 are unaffected: they are only used in the flatpak-builder
tests.

Forwarded: not-needed

Gbp-Pq: Topic debian
Gbp-Pq: Name Use-Python-3-for-test-web-server.patch

flatpak (0.11.8.3-1) unstable; urgency=medium

  * New upstream release

[dgit import unpatched flatpak 0.11.8.3-1]

Import flatpak_0.11.8.3.orig.tar.xz

[dgit import orig flatpak_0.11.8.3.orig.tar.xz]

Import flatpak_0.11.8.3-1.debian.tar.xz

[dgit import tarball flatpak 0.11.8.3-1 flatpak_0.11.8.3-1.debian.tar.xz]

Merge flatpak (0.11.7-1) import into refs/heads/workingbranch

Use Python 3 for test web server

The parts of libtest.sh and tests/make-test-runtime.sh that deal with
Python 2 are unaffected: they are only used in the flatpak-builder
tests.

Forwarded: not-needed

Gbp-Pq: Topic debian
Gbp-Pq: Name Use-Python-3-for-test-web-server.patch

flatpak (0.11.7-1) unstable; urgency=medium

  * New upstream release

[dgit import unpatched flatpak 0.11.7-1]

Import flatpak_0.11.7.orig.tar.xz

[dgit import orig flatpak_0.11.7.orig.tar.xz]

Import flatpak_0.11.7-1.debian.tar.xz

[dgit import tarball flatpak 0.11.7-1 flatpak_0.11.7-1.debian.tar.xz]

Merge flatpak (0.11.5-1) import into refs/heads/workingbranch

Use Python 3 for test web server

The parts of libtest.sh and tests/make-test-runtime.sh that deal with
Python 2 are unaffected: they are only used in the flatpak-builder
tests.

Forwarded: not-needed

Gbp-Pq: Topic debian
Gbp-Pq: Name Use-Python-3-for-test-web-server.patch

parse-datetime: Build YACC parser from source

This requires bison.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Forwarded: https://github.com/flatpak/flatpak/pull/1631

Gbp-Pq: Name parse-datetime-Build-YACC-parser-from-source.patch

make-test-runtime: Look in /{usr/,}sbin for ldconfig

Under normal circumstances ldconfig isn't required to be in ordinary
users' PATHs, but running this script is not a normal circumstance.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Forwarded: https://github.com/flatpak/flatpak/pull/1630

Gbp-Pq: Name make-test-runtime-Look-in-usr-sbin-for-ldconfig.patch

flatpak (0.11.5-1) unstable; urgency=medium

  * New upstream release
  * d/p/make-test-runtime-Look-in-usr-sbin-for-ldconfig.patch:
    Use an upstreamable patch to detect /sbin/ldconfig in tests, instead
    of working around lack of /sbin in PATH in Debian test scripts
  * d/p/parse-datetime-Build-YACC-parser-from-source.patch:
    Force parse-datetime.c to be build from source using bison

[dgit import unpatched flatpak 0.11.5-1]

Import flatpak_0.11.5.orig.tar.xz

[dgit import orig flatpak_0.11.5.orig.tar.xz]

Import flatpak_0.11.5-1.debian.tar.xz

[dgit import tarball flatpak 0.11.5-1 flatpak_0.11.5-1.debian.tar.xz]

Merge flatpak (0.11.3-3) import into refs/heads/workingbranch

Use Python 3 for test web server

The parts of libtest.sh and tests/make-test-runtime.sh that deal with
Python 2 are unaffected: they are only used in the flatpak-builder
tests.

Forwarded: not-needed

Gbp-Pq: Topic debian
Gbp-Pq: Name Use-Python-3-for-test-web-server.patch

Update Czech translation

Fix small typo

Applied-upstream: 1.11.4, commit:56e40530510495062b1a2b87d01014d2f595187a

Gbp-Pq: Name Update-Czech-translation.patch

Fix assertion when no gsettings schema installed

Fixes #1455

Closes: #1456
Approved by: mwleeds
Applied-upstream: 1.11.4, commit:82f993e1c79911f5241c67f2347136156bf9909c

Gbp-Pq: Name Fix-assertion-when-no-gsettings-schema-installed.patch

Update Indonesian translation

Applied-upstream: 1.11.4, commit:92b78122958e694f4b9faec5272954b2d6afdb77

Gbp-Pq: Name Update-Indonesian-translation.patch

flatpak (0.11.3-3) unstable; urgency=medium

  * Add Recommends: policykit-1. This is required when installing apps and
    runtimes system-wide, which is the default for the CLI, but is not
    required when installing into your own home directory with
    "flatpak --user install...". (Closes: #892583)

[dgit import unpatched flatpak 0.11.3-3]

Import flatpak_0.11.3-3.debian.tar.xz

[dgit import tarball flatpak 0.11.3-3 flatpak_0.11.3-3.debian.tar.xz]

Merge flatpak (0.11.3-2) import into refs/heads/workingbranch

Use Python 3 for test web server

The parts of libtest.sh and tests/make-test-runtime.sh that deal with
Python 2 are unaffected: they are only used in the flatpak-builder
tests.

Forwarded: not-needed

Gbp-Pq: Topic debian
Gbp-Pq: Name Use-Python-3-for-test-web-server.patch

Update Czech translation

Fix small typo

Applied-upstream: 1.11.4, commit:56e40530510495062b1a2b87d01014d2f595187a

Gbp-Pq: Name Update-Czech-translation.patch

Fix assertion when no gsettings schema installed

Fixes #1455

Closes: #1456
Approved by: mwleeds
Applied-upstream: 1.11.4, commit:82f993e1c79911f5241c67f2347136156bf9909c

Gbp-Pq: Name Fix-assertion-when-no-gsettings-schema-installed.patch

Update Indonesian translation

Applied-upstream: 1.11.4, commit:92b78122958e694f4b9faec5272954b2d6afdb77

Gbp-Pq: Name Update-Indonesian-translation.patch

flatpak (0.11.3-2) unstable; urgency=medium

  * Merge from experimental to unstable
  * d/p/Update-*-translation.patch: Update Czech and Indonesian
    translations from upstream
  * d/p/Fix-assertion-when-no-gsettings-schema-installed.patch:
    Add patch from upstream fixing an assertion failure if no
    GSettings schemas are installed

[dgit import unpatched flatpak 0.11.3-2]

Import flatpak_0.11.3-2.debian.tar.xz

[dgit import tarball flatpak 0.11.3-2 flatpak_0.11.3-2.debian.tar.xz]

Import flatpak_0.11.3.orig.tar.xz

[dgit import orig flatpak_0.11.3.orig.tar.xz]

Merge flatpak (0.10.4-1) import into refs/heads/workingbranch

Only require FUSE if we're still building the document portal

Signed-off-by: Simon McVittie <smcv@debian.org>
Gbp-Pq: Name Only-require-FUSE-if-we-re-still-building-the-document-po.patch

Use Python 3 for test web server

The parts of libtest.sh and tests/make-test-runtime.sh that deal with
Python 2 are unaffected: they are only used in the flatpak-builder
tests.

Forwarded: not-needed

Gbp-Pq: Topic debian
Gbp-Pq: Name Use-Python-3-for-test-web-server.patch

flatpak (0.10.4-1) unstable; urgency=medium

  * New upstream release
  * Don't install documents portal or permission store. Depend on
    xdg-desktop-portal (>= 0.10) instead: they have moved there.
  * d/p/Only-require-FUSE-if-we-re-still-building-the-document-po.patch:
    Don't depend on FUSE at build-time

[dgit import unpatched flatpak 0.10.4-1]

Import flatpak_0.10.4.orig.tar.xz

[dgit import orig flatpak_0.10.4.orig.tar.xz]

Import flatpak_0.10.4-1.debian.tar.xz

[dgit import tarball flatpak 0.10.4-1 flatpak_0.10.4-1.debian.tar.xz]

Merge flatpak (0.10.3-1) import into refs/heads/workingbranch

Use Python 3 for test web server

The parts of libtest.sh and tests/make-test-runtime.sh that deal with
Python 2 are unaffected: they are only used in the flatpak-builder
tests.

Forwarded: not-needed

Gbp-Pq: Topic debian
Gbp-Pq: Name Use-Python-3-for-test-web-server.patch

flatpak (0.10.3-1) unstable; urgency=medium

  * New upstream bugfix release
    - Fixes a D-Bus filtering bypass in flatpak-dbus-proxy
      (Closes: #888842)

[dgit import unpatched flatpak 0.10.3-1]

Import flatpak_0.10.3.orig.tar.xz

[dgit import orig flatpak_0.10.3.orig.tar.xz]

Import flatpak_0.10.3-1.debian.tar.xz

[dgit import tarball flatpak 0.10.3-1 flatpak_0.10.3-1.debian.tar.xz]

Merge flatpak (0.10.2.1-2) import into refs/heads/workingbranch

Use Python 3 for test web server

The parts of libtest.sh and tests/make-test-runtime.sh that deal with
Python 2 are unaffected: they are only used in the flatpak-builder
tests.

Forwarded: not-needed

Gbp-Pq: Topic debian
Gbp-Pq: Name Use-Python-3-for-test-web-server.patch

flatpak (0.10.2.1-2) unstable; urgency=medium

  * Move Vcs-* to salsa.debian.org
  * Standards-Version: 4.1.3 (no changes required)
  * d/control, d/tests/control,
    d/p/debian/Use-Python-3-for-test-web-server.patch:
    Use Python 3 for tests

[dgit import unpatched flatpak 0.10.2.1-2]

Import flatpak_0.10.2.1-2.debian.tar.xz

[dgit import tarball flatpak 0.10.2.1-2 flatpak_0.10.2.1-2.debian.tar.xz]

Merge flatpak (0.10.2.1-1) import into refs/heads/workingbranch